[Headers] [ARM64EC] Fix extra tokens inside intrin0.h preprocessor directive #112066
Conversation
llvmbot
added
clang
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-backend-x86 Author: Max Winkler (MaxEW707) ChangesFixes #87717. Full diff: https://github.com/llvm/llvm-project/pull/112066.diff 1 Files Affected:
diff --git a/clang/lib/Headers/intrin0.h b/clang/lib/Headers/intrin0.h
index 866c8896617d22..6b01f3808652aa 100644
--- a/clang/lib/Headers/intrin0.h
+++ b/clang/lib/Headers/intrin0.h
@@ -44,7 +44,7 @@ unsigned char _InterlockedCompareExchange128_rel(__int64 volatile *_Destination,
__int64 *_ComparandResult);
#endif
-#ifdef __x86_64__ && !defined(__arm64ec__)
+#if defined(__x86_64__) && !defined(__arm64ec__)
unsigned __int64 _umul128(unsigned __int64, unsigned __int64,
unsigned __int64 *);
unsigned __int64 __shiftleft128(unsigned __int64 _LowPart,
|
|
Please add a testcase (something similar to clang/test/Headers/ms-intrin.cpp, but including intrin0.h instead of intrin.h, to catch obvious mistakes in the header). Not sure how you're actually hitting the error you reported; the clang header directory should count as a system header, so the warning should normally be suppressed, I think. |
It is counted as a system header and I could not repro the warning in my local tests. I was going off the user who posted the issue in the previous PR. clang_cc1 substitution in lit also adds the header path via
|
|
@efriedma-quic What is the process for getting a fix into a milestone such as the upcoming 19.1.2 milestone. I read the docs on |
|
I think it's backport worthy. It's very small and has a near zero regression risk, and is a quite obvious fix. It might be a bit late for 19.1.2 which should be cut tomorrow, but should probably make it for 19.1.3. Just add this PR to the right 19.x milestone and type a |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/6543 Here is the relevant piece of the build log for the reference |
Error: Command failed due to missing milestone. |
|
/cherry-pick 9bf68c2 |
…rective (llvm#112066) Fixes llvm#87717. (cherry picked from commit 9bf68c2)
|
/pull-request #112258 |
…rective (llvm#112066) Fixes llvm#87717. (cherry picked from commit 9bf68c2)
5 participants
Fixes #87717.